Skip to content

diff: add grouped diff gutter actions#21

Merged
hewigovens merged 1 commit intomainfrom
codex/diff-group-gutter
Apr 28, 2026
Merged

diff: add grouped diff gutter actions#21
hewigovens merged 1 commit intomainfrom
codex/diff-group-gutter

Conversation

@hewigovens
Copy link
Copy Markdown
Owner

Summary

  • Add a GitHub Desktop-style group gutter beside the old/new line gutters in native diffs.
  • Support selecting and abandoning contiguous change groups from the group gutter and context menu.
  • Draw connected, mild blue group stripes through the gutter layout manager and cover grouping/rendering behavior with tests.

Validation

  • swift test in shell/mac/Packages/JayJayDiffUI
  • just build

@hewigovens hewigovens changed the title [codex] diff: add grouped diff gutter actions diff: add grouped diff gutter actions Apr 27, 2026
@hewigovens hewigovens marked this pull request as ready for review April 27, 2026 07:01
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a new 'group' column in the diff gutter, featuring a vertical stripe to visually represent contiguous change hunks. The implementation includes a new DiffGutterGrouping utility for range expansion, updates to DiffGutterTextView for handling interactions in the new gutter regions, and enhancements to DiffLayoutManager for stripe rendering. Additionally, gutter-related actions and types were refactored into dedicated files. Review feedback suggests avoiding hardcoded colors in the view logic to support better theming and optimizing the measurement of gutter line widths by using the attributed string's size directly.

Comment thread shell/mac/Packages/JayJayDiffUI/Sources/JayJayDiffUI/NativeDiffView+Gutter.swift Outdated
Comment thread shell/mac/Packages/JayJayDiffUI/Sources/JayJayDiffUI/NativeDiffView.swift Outdated
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a02493bc00

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread shell/mac/Packages/JayJayDiffUI/Sources/JayJayDiffUI/NativeDiffView+Gutter.swift Outdated
@hewigovens hewigovens force-pushed the codex/diff-group-gutter branch 8 times, most recently from 03b406d to 07eb0a8 Compare April 28, 2026 06:59
@hewigovens hewigovens force-pushed the codex/diff-group-gutter branch from 07eb0a8 to b9ade7f Compare April 28, 2026 07:04
@hewigovens hewigovens merged commit a2660b0 into main Apr 28, 2026
2 checks passed
@hewigovens hewigovens deleted the codex/diff-group-gutter branch April 28, 2026 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant